Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify domain lists, remove a lot of duplicated code #1154

Merged
merged 5 commits into from Feb 16, 2020

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 14, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

Simplify domain management by using the same page for both locations where domains can be edited. This removes a large amount of duplicated code, each prone to its own bugs.

Some modifications ensure that features like automatic conversion to the legacy "wildcard" style. This is only available on the "simpler" pages to not confuse users (this happened a few times in the past).

How does this PR accomplish the above?:

See above.

What documentation changes (if any) are needed to support this PR?:

None

…where domains can be edited. This removes a large amount of duplicated code, each prone to its own bugs.

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added this to the v5.0 milestone Feb 14, 2020
@DL6ER DL6ER requested a review from a team February 14, 2020 19:43
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/restore-ability-to-add-blacklists-in-bulk/28091/22

@DL6ER DL6ER merged commit 1dc359d into release/v5.0 Feb 16, 2020
@DL6ER DL6ER deleted the new/unify_domain_pages branch February 16, 2020 13:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants